num1 = 10
num2 = 20
# <<<<<<< HEAD
# 张三写的最新代码
num3 = 300
num4 = 400
# =======
# 李四写的老代码
num3 = 30
num4 = 40
# >>>>>>> 3490cf84f8b3aeb4ec2ea36b9ecc5068ab0d0af9


num100 = 1000
num200 = 2000
